Refactor some more of the ugly b/c update logic out of updaters.inc